…rip-tour-mode

# Conflicts:
#	src/main/scala/beam/agentsim/agents/modalbehaviors/ChoosesMode.scala

…ct trip mode for teleport modes.

…ce-strategy

…ethod atHome to BeamPlan.

…strategy basing on current trip strategy.

…rrectly with tours

…ce-strategy

# Conflicts:
#	src/main/R/freight/freight-processing.R
#	src/main/scala/beam/agentsim/agents/freight/input/FreightReader.scala
#	src/main/scala/beam/agentsim/agents/household/HouseholdActor.scala
#	src/main/scala/beam/agentsim/agents/household/HouseholdFleetManager.scala

…ce-strategy

…ce-strategy

# Conflicts:
#	docs/inputs.rst

…ersonData

…events

…lowed beam modes, having BIKE_BASED not return BIKE if the only bikes available are shared bikes.